Possibly fixed some problems.