Fixes for prodution deployment