Fix small issues, add more pod