Fix a couple of gutter bugs