Fast fixes
Initial commit