fixes for parameterized builds and enabling/disabling