Fixed vars that would result in compile error