Attempt again to satisfy gcc 4.6
Update documenation to-dos regarding gcc 4.6