Fixed problematic situations. I hope.