Minor fixes after a trial run on lab PCs