Fix further issues from running dexy on live projects.