Get rid of a couple more view gremlins