fixes to last commits