Fixes for lychee core for usage of multiple lychee.Environment hierarchies