Small fixes in s06, should be done now