v4.12 some extra fixes for tw 8.20