Minor 2/3 compatibility fixes