Some minor fixes/changes