Managed some bugges