Small label cleanups