Corrected issues

Signed-off-by: Emil Kilhage <emilkilhage@gmail.com>