More fluff fixes