Attempt to fix reply-via not having effect
Fixed compile errors