Changes to fix issues..