more worakrounds for gcc-4.6