Initial tweaks to get specs and features passing.