Fix some bugs

So many remain!