Stupid bugs involving dependencies corrected.