Small fixes

#564 
#532 
#558