Syntax fixes, rename env

Just some fixes we had to make locally.