mhahsler Small fixes.