Minor improvements & bugfixes