Sweet Tooth Fixes