Minor changes to make things work