Added a few items as requested by people on IRC, hopefully fixed viro APC.