Dirty hacks.  Hold the phone, this is getting ugly
Fix the spec and libs for some of these thangs