minor changes to make jalopy happy