Fixes from PAC-ROM