Port Fixes for rmuller/infomas-asl#14
Port Fixes for rmuller/infomas-asl#14