Several fixes after deploiment