Some semantic fixes
Resolves the expression stack