Some fixes for the stap experiment