Some minor fixes in-code