Fixed minifying issues