#485 - Fix broken tests and compilation failures