More tweaks

Signed-off-by: Alan Gardner <urfolomeus@gmail.com>