Made a number of fixes, some temporary, so various views will render without error