Small bug fixes for omaha support