Fixes for morphological analysis