Begin fixing spec tests, fix various real world problems as we go