Various fixed to get Narrato running again.