Single mod toast fixes