Some final, hopefully, tweaks