Toast fixes