Committing latest fixes