Fixed Issues

Signed-off-by: Michael Gehrmann <michael.gehrmann@gmail.com>