Fix compilation conflicts that caused archiving to not compile to an app archive properly.