Fixed minor build errors