two final fixes, more will follow