More fixes that I didn't bother documenting...