squashed bugs

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>