Fixed a few bugs in the port to 3.4