Two more compilation problems fixed for gcc