Bug fixes (no more spikes! and more)