Hotfixes while tim was on site