fixes to run 7-4-stable