Fixes in the code