toast fixes