Minor fixes after move to other system