Fixed same issues in the compiler, hopefully.