Bug fixes and path fixes