Fix springkler related bugs