Fixed minor build problems