Fixing few issues on production