Additional fixes and book spawning