Fix loop style
Build fixes for STLPort + GCC