Fixing few things