Merge latest fixes