More Minor fixe's

More minor fixe's