Loop & short circuit fixes