more fixups atv2