Fixed toaster bugs