Build errors fixed

Had to take into account builds that don't have automatic updates
support