Fix bugs based on reviews from Sonicadvance1.