Fix dependencies again (aaargh!)