Small fixes in soll situation