Bug fixes after live deployment