Small cleanup fixes. Shouldn't be any functional changes