Fixes in if-stmt

In case there's only an if branch