More tricky compiler fixes