addtional fixes from Mandy