Fix null object visibility

I found a couple more bugs in null object visibility.  These are fixes.