some fixes in libraries, but it may break no in packaging