Fixing build related issues