Fixes in the code.