Fixes from trying to run on lunokhod2