Misc api / UI enhancements