Hopefully last bugfixes :)