[ Edit ] fixed some issue caught at package deploy, minor changes

[ Edit ] fixed some issue caught at package deploy, minor changes #284