Fixed some "statement not reached" warnings