minor fixes

f3bfa19  was reviewed by lipkab
bb6bfdc was accepted by Ivanovic