Two small fixes and nuking the old depres (needs to be redone from scratch)