Fixed annoying issues already