ifrpl fixes and hacks