Fix alignment and floats