make-it-work-in-ee-6.1.x

Hello Florencia, the first commit are the only minor changes I made to get it fully working in ee-6.1.x. the second is regenerate SB only. /cc @zsoltbalogh @jamesfalkner