Forgot header <"stdint.h">, fixed some merging issues