Fix compile error, add missing files