Patching up some bugs with the new lib.