Resolved additional 5.3.3 failures, resolved issues introduced to > 5.3.3 versions