Fixes for ARM guard initialisation.