Minification and corrections