Policy Changes from 12/17

Previously uncommited policy changes. Was a bitch to get these to
commit, haha.