Bug fixes in floating code