fix dependencies a little to minimise breakage