fixes during PR