various fixes (plf4)