static local fixes

some static local fixes for #444.