Integration: fixed init scripts and others