Fix remaining conversion issues