Further fixes to the bcrypt implementation