Fixes for prod