fixes / additions for NoPL integration