FIX some issues