Add Fixes suggested by Sebastian Bergmann