Improve handling of run-time dependencies