Few items that were causing minor issues that are now fixed