Fixes PHP notices and broken tests