fix flags, fix tasks and related