Language fixes from Johan's grandfather