Some changes and remove compat