Some cleaning to compile pass trivial errors