Fixes based on staging failure.