fix minor locking problems and disable localization for now