Minor improvements & bug fixes