Fixes and dep tweaks