Fixed compile warning in official build and some polish