More small last minute cleanups.