A few more bugs

Maybe the last few, for now at least...