Fixes from production, to actually have runnable code