Fixes and double->single converted