Fixes for AMCL.