Fixups to get it working