Moved more references to the References class
A couple fixups to the hidden block