Port to 1.7.2 - part 1

2-ish classes does not compile