[TO BE SQUASHED] Minor tweaks