Stuart fix + author fix