Updating dependencies and fixing small issues