some adjustmets to build correctly