straight-forward bug fixes