Update various bits and pieces

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>