Miscfix

Some misc fixes