Settings tweaks

Signed-off-by: Wessel van der Veen <wesselvanderveen@gmail.com>