Added some more cases to the compile/eval functions