Another iteration of dependency updates
Fixed all syntax mismatches