A couple of minor bug fixes

Signed-off-by: Kai Kreuzer <kai@openhab.org>