Some minor Fixes