Fixed some floating / rounding issues