A few more fixes I didn't push yet.