More tweaks

Just small stuff.