More fixes

I will never commit broken code. I will never commit broken code. I will
never commit broken code. I will never commit broken code. I will never
commit broken code. I will never commit broken code. I will never commit
broken code. I will never commit broken code.