Added some missing lines that were not merged in before