Set some const and vars in better places