- Bunch of bugfixes [Bart Uliasz]