couple of small lib changes