Starting minor fixes