Dropped J1-5 support,fixed J1-6 compile problems