Fix optional DefaultHxml build file selection
Fix Make typo