Fix some show-related issues and improve test coverage