Make some stuff snappier