Bug fixes
Some issues arise, fix them in the morning