Some more dependency handling.