Disable perflock, and fix some compilation errors due to previous commit