Fix build and some more sdbization of anal vars