These changes look fine. Could you split these off into a separate PR? They don't seem to be related to the changes below.