FIX: gcc4 1 warnings