Committed latest fixes