Fix some more apis and views...