Some fixes in 'for' loop + something else