Small feature update tweaks