Fixed addtional build problems.