Fixing some build error