fixes to 2 prev commits