August Fixes Pt. Two

Various minor fixes.