Fix-up to compile with 1.3