Minor minor tweaks