Getting 3.x caught up with some 2.x bug fixes