Simple fix for 8 bugs :)