Merging some recent fixes live!