Fix some issues with views