mostly fixes after dependency updates