Fixes for Linux, additional paths