Fixes or hides some steps to not fail because of caching
AHAHA FU CACHING

Another bug bites the dust
Bleargh caching