Fixed some problems...