Various minifying improvements