help fixes from fosco