Some fixes eve more