Bug fixes (mainly a very concerning one that has resolved)