More compile time improvements