more stone fixes