fixes for modern ReSpec