Small fixes for Dave.