Add fixes from rxrz branch