Small fixes

#601