fixing biuld conditions
some build fixes (to work straight out of box)