Small fixes. Still infinite loop.