changes based on spectre tests