Variety of Small fixes