Minor tweaks for the sake of commits