couple changes with corelib