Update: Compile with 1.6.1 snapshots