More Arena bugfixes