[WFCORE-75] : Fixing different issues reported against PR
Currently REMOTE is still the 'default' mode until we add support for multiple options.