Fixed some floating issues