fix dependency issues, hopefully for real