Fixing issues from package change to org.allbinary