*8831* ALM tweaks