Fixed a couple bugs from the Oil commit