Small tweaks to standard packages (will do more later)