Small optimizations and don't allow failure on 5.6