Small updates

Signed-off-by: Rutger Geelen <rutgergeelen@huangis.com>