API compatibility fixes, whitespace fixes, version 6.0.2.1