Some minor fixes/cleanup