Updated to compile against latest rust