FP-related bugfixes.