fixed some build related issues