Faster compile

Some small change to make modest improvements to the compile time.

Merge request reports

Loading