Fixed compile error and comments