Final repairs in code (packages control and util)