1st lot of small fixes