Fixes for errors not displaying correctly