Some more fixes for the "keep show" feature