[FIX] Fix antique computation and some small coding-style improvements

Merged Gabriel Davini requested to merge 8.0-fix_antique into 8.0-stage

Merge request reports