Port Fixes for rmuller/infomas-asl#16