Fixes in marv server actions