#762 fixing staging and some other issues