mahmoud-adam85 Resolve compilation errors