Some compile issues solved