More safeties in platform check, refs #94