Minor updates

Updated to the latest beta patch changes, plus some other minor stuff