Fixes for #1817 (missing dependencies)