Add latest bug fix(es)

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>