Unbit fixes