Small updates
A few updates
Deploy fix