Fixing some errors for a change in bc097f4df1efebc3d2cb7e9024b264b9e1ba9cf6