Minor fixes for STePS