Bugfixes...bugfixes everywhere

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>