Fixed multiple instances of incorrect behaviour