Minor but important tweaks