3hr compat bugfixes and improvements