More bundle locking