Few tweeks for migrating to C9