Minor fixes for minification