Fixes for ATV2