More partial (and not working) fixes for neverending runs