Adjusted build files - Debug and Release builds OK