Make compatible with rust as of 20140212

Quick and dirty changes to make it compile with the current rust after the IO changes