Fix up app builds