more minor fixes to bring us under the page limit.