Bug fixes after first trials in lab.