v5. Fix compiler error and other minor issues.