Fix some problems...