Some workaround bugfixes