fixing build
made some fixes