[fixes] Fixes to calling and packages, environment and all.