Fixes for symlinked usage