A few code nits