Minor bug fixes for set and push