Toast and status fix