Some minor cleanup of start items