Applying patches OK, but put exceptions in place as TODOs