Preliminary Build Fixes