Update some functs and aliases