Correct a few bugs
Correct previous bugs