Merged in changes that should hopefully lead to things working again. Fingers crossed!