Fixing few errors