Cargo cult fixes