Fixed minor oversights