Some more pyflakes warnings

Ticket:	#4518