More buffer overflows fixed