minor optimizations and rescues