Small updates and changes