Fix some compilation errors (to be continued)
Fix some compilation errors (to be continued)