Re-add some stockish stuff to see if crashes are solved