fixed some build related problems