Minimal changes to tabstops
Replace deprecated methods in specs