master: fixed minification bugs