improvements to wrap static package name wrapping, add another compiler param