various fixes running on robot