misc
misc fixes