Fixed Release and Debug_rel builds