Nonesuch credits + Horsepill Fixes