Fixes based on a real deployment