Minor for-loop updates