Config, other tweaks