A few changes to correct release build with new feature structure