Fixed minor issues and updated dependencies