Corrections to build after changing to release build