Some fixes and useless trying