fixing variable declarations (_t added)