Fixed Almond stuff, and probably some other things?