Fix some spleef bugs