Use normpath in a few places (Issue #406)