Small cleanups, plus add credits