Language fixes from @petterhoel