fix empty key paths not handled correctly
fix incorrect scheduler method used