A couple of intermittent attempts to fix stuff