Monster fixes to JAContext