FIX - a few detail fix