Fix compiler error in hardcodedDesign app on Windows and some clean-up