I had the same trouble with the battery fitting properly, I must have spent an hour trying to fit my 8.4v mini type square battery when I decided to look at the problem logically There is a spring above the outer barrel but I dont know what purpose it serves (I'm a newb, maybe someone can inform me what it is), so I removed the spring which allowed the battery to just about fit, but then when I put the handguard back on the pin which holds it in place wouldnt fit, so I put a different pin (from my naff cybergun m4 springer) which was a tiny bit thinner in the handguard and it works fine.