Few minor Fixes