ElasticAlign fixes: