Work around more dependency problems