more fixes during PR