CHG: FloatingOrigin tweaks.