Noticed some of those fixes in there