Fixing undefined variables...