Some fixes and couts