Quick cleanup of warnings and added required lib.