More aggressive locking at all stages. This seems to help with reliability.