*Fix some  bugs