Improve minification support