Ai

Fix compile error & warnings.
Merged next.