Some tweaks to the formspec