More fixes for package private stuff.
Moved some stuff to NOPASS.