Fixes issues where values have the wrong type. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>