Some fixes
again some build fixes