Little fixes

addresses 9) in #440