Small fixes, shorter timeout.