Bugfixes with buildpath