Fixed minor things from error #77