Misc fixes in impl