more fixes thanks to eiffeldoc