Fix misc
clean up