Fixes during PR