Fix module base and controller base