Fixed issues with paths and dependancies