Minor tweaks to prevent error output