2.04.0:zeress:38 Fixes for Schwar's :20 Commit