Fixes, minified code