Fixed compile issues with new code base.