Views bug fixes