Minor fixes, simulated timeout works