Various fixes. Meh, commits.