Update with some fixes from Dreamshop