Fixes to get stable to work with default build JSON files.