Developer test bug fixes