Fix atom space jankiness