secondary bug fixes