Made c99 compatibility changes