Possibly out-of-date fixes