Various stoneboard fixes.