Some fixes, timeouts partially working