Testing: bug fixes