Further error message tweaks