Minor cleanup prior to release