Update core to version 6, fix some possible headless client issues