Dependency updates and minor code improvements