5 Fixes

I hope.