[fix] Prevent buffer overflows...