Fixed some minor issues encountered while performing functional tests