A few little tweaks