fixes for core to fix issues for the native driver