minor changes necessary since spin locks are not recursive

and there was still some logic relying on that property