Fixed auto-conversion issues