Bug-/typo-fixes