And two bug fixes