Further byte-locks edits