Updated code to compile with std lib changes.