Fix Views (I swear we did this before...)