Fix packages and twb block