Fixes in code