Various prod fixes