Fixing compile and test errors.