Fix remaining nits