Fix some timeout issues and Postgress strictness of id being numbers