A few little tweaks here and there