Fixed some oversights