Fixed a couple of gcc warnings

Gcc is silly, if I go into a case switch with an enum, go through
all the options in the enum and return from all the cases I shouldn't
need to put an extra return statement after the case switch.

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>