Some bugs should be resolved by this, mostly warnings when loading extra controllers