More minor Fixes