Some fixes for multiple puts