Bug fixing and deploy