Fixup little Fixes #2