Minor fixes/updates for gcc 4.6.3 on Linux