Fixes for spike