Small changes to get workbooks to compile