Fix some missing dependencies/exports