Fix some design and issues related to.