A few minor changes to pass checks