Fix some build errors because of missing dependencies