Minor GENR wip-tweaks