Feature/minor fixes 1

Two itty-bitty broken things.