Smaller fixes to stuff that broke on 3.x
3 files changed