Revet some things t fix compilation