Typing Errors bug fixes