Build Fixes from commits today