Make* class tweaks

Closed Ralf Jung requested to merge ralf/make into master

Merge request reports