House keeping & minor fixes