Additional minor tweaks