Fixes and improvements to some packages

If it is needed, I can split this PR, but all this is fairly unobtrusive.