Fixed various typing errors