Various small fixes following from Bert's commentaar.