Fixing requested issues