Last two CS-fixes (At least I hope so)