fixes for 2.1

Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>