Fixed messages in vafwait