Various bug fixes for Snapshot 13w35d