Fixed typo & fixed up timeout related callbacks