Some more work on minification stuff