More fixes for "apply already in progress" errors