[Fixed] some compilation errors, WIP