Cleanup type conversions