Mario: some more bug fixes