Resolving some build errors