Prepare for deploy
Some fixes