Cleanup

Just two litte things before the v1.1 release :wink: