Minor cleanup, release prep