Small updates to make things work