more changes for stricter C