Mario: some minor fixes