Fixed some compat