More Mike fixes