more fixes for dfdf53e2a9faa8f33a8a6a0c9ac090e8e7608a73