Make gcc46 compatible
Minor changes