Register bind and lock fix