Fix misc and clean up