Prevent incorrect directory names when globbing
Remove unused var
Merge branch 'srcmap'