Kotomi and fixes