Tweaks

More gremlin squashing.