OK I can't merge this unless Dimitris merges your fixes.