Tested in alternate platform and fixed minor issues