Small tweaks considering column aliases