Fixed up warnings re: undefined variables