Few minor changes to fix some system tests