fix problems around feature macro.