Fix shareware/beta issues