Consolidate 3 patchs

Two were small fixes for the first