Fixes after production use