[FIX] cli/server: fixes #1307, add missing Environment management blocks