Fix warnings about using .get()