Got rid of useless timeouts and small typo fix