Fixed minor glitches to make everything comlpile