Some fixes in existing code
static libs