Minification enhancements