Update to latest changes from beasty