Fixes to avoid nverending requests