Small additions for eventual POST support.