mount and assist fixes