Small fixes

#564 
#532 
#558 

Merged master into development (yup it's messy :no_mouth:)