Partial fixes for a few more visual examples