Fixes few notices and warnings

Conflicts:
	gridform.module