Transferred more bugfixes