Fix and tweaks package