Minor under the hood changes