fixes for stricter C