Milestone #2 post fixes for flicker api.