Some fixes. I hate this hack, sorry.