Update patches, remove compilation fix
Fix formatting
Fix compilation