Some stuff to allow required fields to work better