More un-support related changes and some style fix.