Fixed some Nits before landing