Fixed gameplay issues