Final upstart and mount point fixes.