Bugfixes! Pt. 2