[fix] more fixes and adaptations to lauch