Fixes for unadded deps