Build path fixes