Fixes for #1473, regression caused by rmuller/infomas-asl#16