Few more bugfixes