Handle more FIXMEs
Use size_t for strlen variables