making standalone builds work again, without breaking anything else...