Various 020+ fixes. In brief, this commit fixes the following: