Final changes to compile with 0.9.5