Fix some compile bug after some test. Not everything is complete but we are getting there.