A couple of Small fix Ups