Fixes for Kurfess' comments