Fixed bugs

Signed-off-by: nbuechler <natebuechler@gmail.com>