Fix path & branch issues