Fixed multiple small issues