cleanup some warnings in the release build as a result of the last commit regarding...