Bug fixes with toast