Fix possible bufferoverflows