filesystem cleanup
Small change int32 to int32_t for portable building