Faye related fixes