Some fixes for weird junk

see commits