Improve gcc compatibility