Improvements to error message correctness
Fixed paths in error messages