fixes

Change-Id: I208e9b98af0c4212ee604772cf5da0053b58ceea
fixed polar flag in gentop

Change-Id: I595dfa281c411aa1682a0dc11118dd12f1e5ecb1