Lib update. Cleaned up some warnings.