Fixes of code.