small fixes so that it compiles with ubuntu 12.10 gcc 4.7.3
small fixes so that it compiles with ubuntu 12.10 gcc 4.7.3