Add complie error fixes