Backwards compatibility and fixing if statements