Fix minification problems