Fixing some areas where views weren't being closed.