Path changes, bugfixes