delegate callbcks fixes