fix some issues with recent commits