Fix commands options