The latest fixes