Restore Formastic version support
Fix rdoc issue