fixes needed for more advanced template with new nepho codebase.