Update with Chad's latest fixes