Change default_lock to something a bit more sane