Small fixes in s05, should be done now