Downgrade remaining SFF null-padding errors, issue #219