Fixes errors from rustc update, library changes