Small fixes, done for the day 6/5