small fixes for marvin