Fixes in implementation